[AUTO-CHERRYPICK] [High] Patch docker-buildx for CVE-2026-39833 - branch 3.0-dev#17641
Merged
Merged
Conversation
Co-authored-by: Azure Linux Security Servicing Account <azurelinux-security@microsoft.com> (cherry picked from commit a983093)
CBL-Mariner-Bot
added
the
Auto Fast-track Cherry-pick
microsoft-github-policy-service
Bot
added
Packaging
3.0-dev
CBL-Mariner-Bot
marked this pull request as ready for review
June 8, 2026 14:16
Collaborator
Author
|
All conflicts resolved. |
Collaborator
Author
Auto Cherry-Pick SPEC Validation Summary
|
| Source (fasttrack) | Target (3.0-dev) | Resolved | |
|---|---|---|---|
| Version | 0.14.0 | 0.14.0 | None |
| Release | 15 | 14 | 15 |
| Patches | 26 | 25 | 26 |
| Conflict | Yes |
- Version-release None-15 is not higher than Source 0.14.0-15
- Version-release None-15 is not higher than Target 0.14.0-14
- Duplicate changelog entry for 0.14.0-11 (appears 2 times)
- Changelog out of order: 0.14.0-11 appears before 0.14.0-13
- Directive present in both Source and Target was dropped: BuildRequires: bash
- Directive present in both Source and Target was dropped: BuildRequires: golang < 1.25
The auto cherry-pick resolver dropped the preamble (Name, Version, License, Group, Vendor, BuildRequires) and reordered the changelog incorrectly (-11 above -13, -12 missing entirely). Since 3.0-dev had no unique changes vs fasttrack pre-merge, the correct merge result is identical to fasttrack/3.0's spec. Flagged by cherrypick-health check.
jslobodzian
approved these changes
Jun 26, 2026
Contributor
There was a problem hiding this comment.
Pull request overview
This is an auto-generated cherry-pick of PR #17590 to the 3.0-dev branch, patching docker-buildx for CVE-2026-39833 and completing the partial fix for CVE-2026-39832 in the vendored golang.org/x/crypto/ssh/agent code. It adds a new patch that makes the in-memory keyring reject keys with the unsupported ConfirmBeforeUse constraint, and reworks the existing CVE-2026-39832 patch to carry the full two-commit upstream fix (client-side constraint-extension serialization plus keyring rejection of unsupported constraint extensions).
Changes:
- Add
CVE-2026-39833.patchand register it asPatch25, bumpingReleaseto 15 with a corresponding changelog entry. - Replace the partial CVE-2026-39832 patch with the complete fix combining upstream commits
e3d1254anda1ce0fe. - The keyring.go patch chain remains consistent and applies in numeric order via
%autosetup -p1.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| SPECS/docker-buildx/docker-buildx.spec | Bumps Release to 15, registers Patch25 for CVE-2026-39833, and adds the changelog entry. |
| SPECS/docker-buildx/CVE-2026-39833.patch | New patch making the in-memory keyring reject the unsupported ConfirmBeforeUse constraint. |
| SPECS/docker-buildx/CVE-2026-39832.patch | Reworked to carry the complete two-commit upstream fix (client.go serialization + keyring.go rejection of constraint extensions). |
Collaborator
|
/azurepipelines run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
anphel31
approved these changes
Jun 26, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is an auto-generated pull request to cherry-pick commit a983093 to 3.0-dev. Original PR: #17590
In case of no merge conflicts, the PR is merged without approval because it's an automated cherry-pick of an already approved PR.
In case of merge conflicts, an AI-based conflict resolver will attempt to resolve conflicts and might make mistakes. The reviewer must check AI's work before approving.